Merge from trunk
authorJan D. <jan.h.d@swipnet.se>
Sun, 28 Feb 2010 14:32:51 +0000 (15:32 +0100)
committerJan D. <jan.h.d@swipnet.se>
Sun, 28 Feb 2010 14:32:51 +0000 (15:32 +0100)

Trivial merge